auto upstream
authorJoakim Verona <joakim@verona.se>
Fri, 21 Dec 2012 02:15:59 +0000 (03:15 +0100)
committerJoakim Verona <joakim@verona.se>
Fri, 21 Dec 2012 02:15:59 +0000 (03:15 +0100)

Trivial merge